From: Wolfgang Denk <wd@denx.de>
Date: Mon, 21 Nov 2011 21:02:35 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nds32
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=3bf03add545f8988f2fef64b7975beb4ec8bf99f;p=project%2Fbcm63xx%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-nds32

* 'master' of git://git.denx.de/u-boot-nds32:
  nds32/lib: add ide generic support
  nds32: enhance io.h for compatibility with periphals
  ftide020: fix incorrect information display format
---

3bf03add545f8988f2fef64b7975beb4ec8bf99f